gtkwindow: Update to using GdkEvent API

diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 589dd31dfa9400cfbd00494ea7926c1b72e5b9bc..4d95aa257ed3b01c5266ddb2e1aa1437d6acf96c 100644 (file)
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -1816,7 +1816,7 @@ captured_event_cb (GtkWidget *widget,
     "sw-resize", "s-resize", "se-resize"
   };
 
-  if (event->type != GDK_MOTION_NOTIFY)
+  if (gdk_event_get_event_type (event) != GDK_MOTION_NOTIFY)
     return GDK_EVENT_PROPAGATE;
   if (!gdk_event_get_coords (event, &x, &y))
     return GDK_EVENT_PROPAGATE;
@@ -7454,12 +7454,13 @@ gtk_window_handle_wm_event (GtkWindow *window,
                             GdkEvent  *event,
                             gboolean   run_drag)
 {
+  GdkEventType event_type = gdk_event_get_event_type (event);
   gboolean retval = GDK_EVENT_PROPAGATE;
   GtkWindowPrivate *priv;
 
-  if (event->type == GDK_BUTTON_PRESS || event->type == GDK_BUTTON_RELEASE ||
-      event->type == GDK_TOUCH_BEGIN || event->type == GDK_TOUCH_UPDATE ||
-      event->type == GDK_MOTION_NOTIFY || event->type == GDK_TOUCH_END)
+  if (event_type == GDK_BUTTON_PRESS || event_type == GDK_BUTTON_RELEASE ||
+      event_type == GDK_TOUCH_BEGIN || event_type == GDK_TOUCH_UPDATE ||
+      event_type == GDK_MOTION_NOTIFY || event_type == GDK_TOUCH_END)
     {
       priv = window->priv;
 
@@ -7480,6 +7481,7 @@ _gtk_window_check_handle_wm_event (GdkEvent *event)
 {
   GtkWindowPrivate *priv;
   GtkWidget *widget;
+  GdkEventType event_type;
 
   widget = gtk_get_event_widget (event);
 
@@ -7494,9 +7496,11 @@ _gtk_window_check_handle_wm_event (GdkEvent *event)
   if (!priv->multipress_gesture)
     return GDK_EVENT_PROPAGATE;
 
-  if (event->type != GDK_BUTTON_PRESS && event->type != GDK_BUTTON_RELEASE &&
-      event->type != GDK_MOTION_NOTIFY && event->type != GDK_TOUCH_BEGIN &&
-      event->type != GDK_TOUCH_END && event->type != GDK_TOUCH_UPDATE)
+  event_type = gdk_event_get_event_type (event);
+
+  if (event_type != GDK_BUTTON_PRESS && event_type != GDK_BUTTON_RELEASE &&
+      event_type != GDK_MOTION_NOTIFY && event_type != GDK_TOUCH_BEGIN &&
+      event_type != GDK_TOUCH_END && event_type != GDK_TOUCH_UPDATE)
     return GDK_EVENT_PROPAGATE;
 
   if (gtk_widget_event (widget, event))